(verify_charstarts): Count right for continued lines.

diff --git a/src/dispnew.c b/src/dispnew.c
index 68e9423fcbdfee439da9413382d2453815733718..856659483a405c33a2a5fe94928c989839d1dcd2 100644 (file)
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -960,7 +960,15 @@ verify_charstarts (w)
       for (j = left; j < right; j++)
        if (charstart[j] > 0)
          last = charstart[j];
-      next_line = last + (BUF_ZV (XBUFFER (w->buffer)) != last);
+      /* Record where the next line should start.  */
+      next_line = last;
+      if (BUF_ZV (XBUFFER (w->buffer)) != last)
+       {
+         /* If there's a newline between the two lines, count that.  */
+         int endchar = *BUF_CHAR_ADDRESS (XBUFFER (w->buffer), last);
+         if (endchar == '\n')
+           next_line++;
+       }
     }
 }
 \f